Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disallow use of Plugin or PluginConfig when using Policy #88864

Merged
merged 1 commit into from
Mar 6, 2020
Merged

Disallow use of Plugin or PluginConfig when using Policy #88864

merged 1 commit into from
Mar 6, 2020

Conversation

alculquicondor
Copy link
Member

@alculquicondor alculquicondor commented Mar 5, 2020 •
edited

What type of PR is this?

/kind bug

What this PR does / why we need it:

Plugin/PluginConfig and Policy are competing APIs. If using them together, merging semantics become complicated. We should explicitly disallow them.

/sig scheduling

Which issue(s) this PR fixes:

This simplifies #88529

Special notes for your reviewer:

This disables any support for using Extenders and Plugin/PluginConfig at the same time. It should be merged after #88768

Does this PR introduce a user-facing change?:

Plugin/PluginConfig and Policy APIs are mutually exclusive when running the scheduler

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 5, 2020
@alculquicondor
Copy link
Member Author

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 5, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alculquicondor

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 5, 2020
@ahg-g
Copy link
Member

ahg-g commented Mar 5, 2020

/lgtm

+1 to merging this only if #88768 makes it before the freeze

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 5, 2020
Huang-Wei
Huang-Wei reviewed Mar 5, 2020
View reviewed changes
pkg/scheduler/factory.go Outdated
pluginConfig = append(pluginConfig, prof.PluginConfig...)
prof.PluginConfig = pluginConfig
if len(prof.PluginConfig) != 0 {
return nil, errors.New("using PluginConfig and Policy is not supported")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: reuse the error string, and using PluginConfig and Policy at the same time is not supported sounds clearer.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The errors are slightly different. Added the word simultaneously.

@damemi
Copy link
Contributor

damemi commented Mar 5, 2020

/milestone v1.18
/retest

@k8s-ci-robot
Copy link
Contributor

@damemi: You must be a member of the kubernetes/milestone-maintainers GitHub team to set the milestone. If you believe you should be able to issue the /milestone command, please contact your and have them propose you as an additional delegate for this responsibility.

In response to this:

/milestone v1.18
/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ahg-g
Copy link
Member

ahg-g commented Mar 5, 2020

/milestone v1.18

@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Mar 5, 2020
@alculquicondor
Disallow use of Plugin or PluginConfig when using Policy
1fab275 
Signed-off-by: Aldo Culquicondor <acondor@google.com>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 5, 2020
@alculquicondor
Copy link
Member Author

/retest

@Huang-Wei
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 6, 2020
@alculquicondor
Copy link
Member Author

/hold cancel

#88768 is already approved

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 6, 2020
@k8s-ci-robot k8s-ci-robot merged commit 1302f34 into kubernetes:master Mar 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Huang-Wei Huang-Wei Huang-Wei left review comments

@hex108 hex108 Awaiting requested review from hex108

@liu-cong liu-cong Awaiting requested review from liu-cong

Assignees

@Huang-Wei Huang-Wei

@ahg-g ahg-g

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.18
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@alculquicondor @k8s-ci-robot @ahg-g @damemi @Huang-Wei